projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c59288 7074155)
bitkeeper revision 1.1159.1.448 (41a4e1873FIBJhbUOyKJjtxPlJiEgA)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 24 Nov 2004 19:31:19 +0000 (19:31 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 24 Nov 2004 19:31:19 +0000 (19:31 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/arch/x86/x86_32/mm.c patch | diff1 | diff2 | blob | history
xen/arch/x86/x86_32/seg_fixup.c patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/arch/x86/x86_32/mm.c
Simple merge
diff --cc xen/arch/x86/x86_32/seg_fixup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.